theme: Clean up and merge window-caption definitions

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 3e503708f4a063bb53cdc8524c12d083cdebe046..0e174f2753164ecbc49fab7606bbb050a4ad8932 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -632,10 +632,6 @@ StScrollBar StButton#vhandle:active {
     padding-bottom: 32px;
 }
 
-.window-caption {
-    spacing: 25px;
-}
-
 .workspace-thumbnails-background {
     border: 1px solid rgba(128, 128, 128, 0.4);
     border-right: 0px;
@@ -663,6 +659,7 @@ StScrollBar StButton#vhandle:active {
 }
 
 .window-caption {
+    spacing: 25px;
     background: rgba(0,0,0,0.5);
     border-radius: 8px;
     padding: 4px 12px;
@@ -670,6 +667,10 @@ StScrollBar StButton#vhandle:active {
     border: 2px solid rgba(0, 0, 0, 0);
 }
 
+.window-caption:hover {
+    border: 2px solid rgba(255, 255, 255, 0);
+}
+
 .window-close, .notification-close {
     background-image: url("close-window.svg");
     background-size: 32px;
@@ -681,10 +682,6 @@ StScrollBar StButton#vhandle:active {
     -shell-close-overlap: 16px;
 }
 
-.window-caption:hover {
-    border: 2px solid rgba(255, 255, 255, 0);
-}
-
 .window-clone-border {
     border: 4px solid rgba(255, 255, 255, 0.5);
     border-radius: 4px;